grid: Swap wrong spacing properties

row-spacing behaved like column-spacing should have and vice versa.

Also update tests that erroneously checked this behavior.

Thanks to Joanmarie Diggs for finding this.

diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index df6d74daecd8fb644ab650b0a9f111a498660d19..f6ec2f11113f2450dc7b9c3ca6deb676790fba15 100644 (file)
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -163,11 +163,11 @@ gtk_grid_get_property (GObject    *object,
       break;
 
     case PROP_ROW_SPACING:
-      g_value_set_int (value, ROWS (priv)->spacing);
+      g_value_set_int (value, COLUMNS (priv)->spacing);
       break;
 
     case PROP_COLUMN_SPACING:
-      g_value_set_int (value, COLUMNS (priv)->spacing);
+      g_value_set_int (value, ROWS (priv)->spacing);
       break;
 
     case PROP_ROW_HOMOGENEOUS:
@@ -1821,9 +1821,9 @@ gtk_grid_set_row_spacing (GtkGrid *grid,
 
   priv = grid->priv;
 
-  if (ROWS (priv)->spacing != spacing)
+  if (COLUMNS (priv)->spacing != spacing)
     {
-      ROWS (priv)->spacing = spacing;
+      COLUMNS (priv)->spacing = spacing;
 
       if (gtk_widget_get_visible (GTK_WIDGET (grid)))
         gtk_widget_queue_resize (GTK_WIDGET (grid));
@@ -1848,7 +1848,7 @@ gtk_grid_get_row_spacing (GtkGrid *grid)
 
   priv = grid->priv;
 
-  return ROWS (priv)->spacing;
+  return COLUMNS (priv)->spacing;
 }
 
 /**
@@ -1868,9 +1868,9 @@ gtk_grid_set_column_spacing (GtkGrid *grid,
 
   priv = grid->priv;
 
-  if (COLUMNS (priv)->spacing != spacing)
+  if (ROWS (priv)->spacing != spacing)
     {
-      COLUMNS (priv)->spacing = spacing;
+      ROWS (priv)->spacing = spacing;
 
       if (gtk_widget_get_visible (GTK_WIDGET (grid)))
         gtk_widget_queue_resize (GTK_WIDGET (grid));
@@ -1896,5 +1896,5 @@ gtk_grid_get_column_spacing (GtkGrid *grid)
 
   priv = grid->priv;
 
-  return COLUMNS (priv)->spacing;
+  return ROWS (priv)->spacing;
 }

diff --git a/tests/reftests/grid-spacing1.ui b/tests/reftests/grid-spacing1.ui
index a8a330ada1b367cd5f58d9c7df3a892f418be39e..eda8526a04002c400444080ec3de0183b89d3d17 100644 (file)
--- a/tests/reftests/grid-spacing1.ui
+++ b/tests/reftests/grid-spacing1.ui
@@ -13,7 +13,7 @@
           <object class="GtkGrid" id="grid0">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="row-spacing">20</property>
+            <property name="column-spacing">20</property>
             <child>
               <object class="GtkLabel" id="one">
                 <property name="visible">True</property>

diff --git a/tests/reftests/grid-spacing2.ui b/tests/reftests/grid-spacing2.ui
index 0e9c82f056683950b4799f89d6f48f747511f35d..fe28a559132d2474b41a0d43aec4e8faa06934bb 100644 (file)
--- a/tests/reftests/grid-spacing2.ui
+++ b/tests/reftests/grid-spacing2.ui
@@ -13,7 +13,7 @@
           <object class="GtkGrid" id="grid0">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="column-spacing">20</property>
+            <property name="row-spacing">20</property>
             <child>
               <object class="GtkLabel" id="one">
                 <property name="visible">True</property>